Skip to content

chore(deps): consolidate open version bumps#696

Merged
berendt merged 5 commits into
mainfrom
chore/consolidate-version-bumps
Jul 20, 2026
Merged

chore(deps): consolidate open version bumps#696
berendt merged 5 commits into
mainfrom
chore/consolidate-version-bumps

Conversation

@berendt

@berendt berendt commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Consolidates the open Renovate version bumps into a single PR, including the
follow-up changes each bump needs to actually go green. The K-ORC bump is
deliberately left out.

Included

Supersedes Bump
#667 actions/attest digest → f7c74d2
#664 flux-operator v0.54.1 → v0.55.0
#661 actions/setup-go v6 → v7 (10 pins)
#636 nixpkgs flake input (lock-file maintenance)
#600 gophercloud/v2 v2.11.1 → v2.13.0
#533 gateway-api v1.5.1 → v1.6.1
#506 flux CLI 2.8.8 → 2.9.2, kubectl v1.36.1 → v1.36.2

Not included

#526 — cert-manager v1.21.0 stays blocked. v1.21.0 removes the deprecated
cmmeta.ObjectReference alias for IssuerReference. mariadb-operator
v0.38.1 — the latest release — still references it, so the workspace stops
compiling:

mariadb-operator@v0.38.1/api/v1alpha1/mariadb_types.go:353:30: undefined: cmmeta.ObjectReference

There is no newer mariadb-operator to upgrade to, so this needs an upstream
release first. Everything else here is independent of it.

What the version-only branches were missing

Each of these is why the corresponding Renovate branch was red:

  • gateway-api — the branch left stale go.sum entries, so module loading
    rewrote them during make manifests and verify-codegen failed on a dirty
    tree. Fixed by go mod tidy per module plus go work sync. controller-gen
    output itself is unchanged.
  • flux CLI / kubectl — the branch bumped the version constants but not the
    pinned per-platform SHA256 constants, so verify_sha256 aborted the
    installer on a checksum mismatch. That took down chainsaw-lint and
    e2e-infra, both of which install their tooling through this script. All
    eight digests were re-hashed from the upstream artifacts; darwin/arm64 is
    additionally verified end-to-end by running the installer. The
    optional-flux test stubs and the pinned-tooling reference table carry the
    versions literally and move with them.
  • flux-operatordeploy/kind/base/flux-web.yaml pins the Helm chart to
    the operator's minor track (0.54.x0.55.x), and
    kind_base_flux_web_test.sh asserts that coupling literally. Version-only
    bump ⇒ test-shell red.

Failures that were not the bumps

Verification

make build, make test, make lint (0 issues × 5 modules), make shellcheck,
make verify-crd-sync and make test-shell all run locally. test-shell has a
set of failures that reproduce identically on main on macOS; the failure sets
were diffed against a main worktree and are byte-identical, so nothing here
regresses.

Noted, not changed

GATEWAY_API_VERSION in hack/deploy-infra.sh is still v1.1.0 while the Go
module is now v1.6.1, despite the comment asking to keep them aligned. That
drift predates this PR (it was already 4 minor versions behind at v1.5.1).
Bumping the CRD bundle installed into kind is a real infrastructure change that
also needs the gwapi_crds presence list re-checked, so it belongs in its own
PR.

berendt added 5 commits July 20, 2026 14:33
Bump sigs.k8s.io/gateway-api from v1.5.1 to v1.6.1 across all five
workspace modules and github.com/gophercloud/gophercloud/v2 from
v2.11.1 to v2.13.0 in the keystone operator, keeping the shared
transitive set (go-openapi/swag, fxamacker/cbor, k8s.io/kube-openapi)
in lockstep.

Both bumps are source-compatible: controller-gen output is unchanged
and the gophercloud identity/v3/federation package -- the only
gophercloud API the keystone operator consumes besides the root
package -- is byte-identical between v2.11.1 and v2.13.0.

The individual Renovate branches left stale go.sum entries behind,
which made verify-codegen fail on a dirty tree after module loading
rewrote them. Running `go mod tidy` per module plus `go work sync`
resolves that.

cert-manager v1.21.0 is deliberately NOT part of this bump: it drops
the deprecated cmmeta.ObjectReference alias, which mariadb-operator
v0.38.1 (the latest release) still references, so the workspace no
longer compiles. That bump stays blocked on a mariadb-operator
release.

On-behalf-of: @SAP
Assisted-by: Claude:claude-opus-4-8[1m]
Signed-off-by: Christian Berendt <berendt@23technologies.cloud>
Bump the pinned E2E test tooling in hack/install-test-deps.sh and
replace the per-platform SHA256 constants alongside the versions.

The version constants alone are not enough: verify_sha256 compares
every download against a pinned hash, so bumping FLUX_VERSION and
KUBECTL_VERSION without the matching digests aborts the installer on
a checksum mismatch -- which is what took chainsaw-lint and e2e-infra
down, since both jobs install their tooling through this script.

All eight digests were taken from the upstream release artifacts and
independently re-hashed after download; the darwin/arm64 pair is
additionally verified end-to-end by running the installer.

The optional-flux test stubs pre-populate binaries whose reported
version must match the pins for the "already installed" short-circuit
to fire, so their hardcoded versions move too, as does the pinned
tooling table in the e2e-deployment reference.

On-behalf-of: @SAP
Assisted-by: Claude:claude-opus-4-8[1m]
Signed-off-by: Christian Berendt <berendt@23technologies.cloud>
Bump FLUX_OPERATOR_VERSION in hack/deploy-infra.sh and move the
flux-web ResourceSet chart pin from the 0.54.x to the 0.55.x SemVer
range.

The two are documented as a bump-together pair: the kind-only Web UI
addon installs the flux-operator Helm chart, whose version track
follows the operator release applied before the FluxInstance CR. The
kind_base_flux_web_test assertions encode that coupling literally,
which is why the version-only Renovate branch failed test-shell.

On-behalf-of: @SAP
Assisted-by: Claude:claude-opus-4-8[1m]
Signed-off-by: Christian Berendt <berendt@23technologies.cloud>
Bump all ten actions/setup-go pins in ci.yaml from v6 to v7 and the
actions/attest digest in the supply-chain-attest composite action.

Both are digest-pinned action bumps with no workflow-level changes.
The image-build failures on the attest branch were Docker Hub 502s
pulling moby/buildkit, unrelated to the digest.

On-behalf-of: @SAP
Assisted-by: Claude:claude-opus-4-8[1m]
Signed-off-by: Christian Berendt <berendt@23technologies.cloud>
Lock-file maintenance for the nixos-unstable nixpkgs input.

On-behalf-of: @SAP
Assisted-by: Claude:claude-opus-4-8[1m]
Signed-off-by: Christian Berendt <berendt@23technologies.cloud>
@berendt
berendt merged commit de2e144 into main Jul 20, 2026
88 checks passed
@berendt
berendt deleted the chore/consolidate-version-bumps branch July 20, 2026 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant